diff --git a/src/api/dike/index.js b/src/api/dike/index.js
index a93cb7b..5f160b5 100644
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@@ -290,7 +290,7 @@ export function postYhRecordaApproval(data) {
export function delRunDzYhPlan(data) {
return request({
url: `/run/df/yh/plan/${data.id}`,
- method: 'del'
+ method: 'delete'
})
}
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index e7e4791..e8b5a1a 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -257,6 +257,10 @@
v-for="(activity, index) in activities"
:key="index"
:timestamp="activity.approvalTime">
+ 待提交
+ 审批中
+ 已通过
+ 已驳回
审批意见: {{activity.comment}}
审批附件: {{
activity.docs &&
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index a14a2c0..f9efe7c 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -25,7 +25,9 @@ export default {
adcd: "",
dikeName: "",
dikeType: "",
+ engScal: "",
name: "",
+ status: "",
planDateArr: [],
},
choiceDate: '',
@@ -37,11 +39,10 @@ export default {
}
},
disabledDate: (time) => {//只能选择5年数据
- let curDate = (new Date()).getTime();
- let three = 5 * 12 * 30 * 24 * 3600 * 1000;
- let min = curDate + three;
- let max = curDate - three;
if (this.choiceDate) {
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let min = this.choiceDate + three;
+ let max = this.choiceDate - three;
return time.getTime() < max || time.getTime() > min;
} else {
return false;
@@ -52,6 +53,7 @@ export default {
dialogVisible: false,
areasOptions: [], // 行政区划列表
embankmentTypeOptions: [], // 堤防类型列表
+ scaleOptions: [], // 堤防类型列表
supplementOptions: [], // 资金来源列表
tableData: [], // 表格列表
tableCheckData: [], // 选中的数据
@@ -148,6 +150,8 @@ export default {
: null,
dikeName: this.paramsData.dikeName,
dikeType: this.paramsData.dikeType,
+ engScal: this.paramsData.engScal,
+ status: this.paramsData.status,
},
pageSize: this.pageData.pageSize,
pageNum: this.pageData.pageNum,
@@ -208,6 +212,8 @@ export default {
this.paramsData.planDateArr = [];
this.paramsData.dikeName = "";
this.paramsData.dikeType = "";
+ this.paramsData.engScal = "";
+ this.paramsData.status = "";
this.reqCountCalc();
this.pageData.pageNum = 1;
@@ -235,12 +241,21 @@ export default {
})
return name;
},
+ // 过滤时间日期
+ formatDate(dateStr) {
+ const date = new Date(dateStr);
+ console.log(date)
+ return date.toISOString().split('T')[0];
+ }
},
created() {
this.getTreeData();
this.getDicts("embankment_type").then((response) => {
this.embankmentTypeOptions = response.data;
});
+ this.getDicts("df-scale").then((response) => {
+ this.scaleOptions = response.data;
+ });
this.getDicts("xs_yh_supplement").then((response) => {
this.supplementOptions = response.data;
@@ -317,6 +332,26 @@ export default {
placeholder="请输入名称"
/>
+
+ 工程规模
+
+
+
+
+
维养计划日期
+
+ 计划状态
+
+
+
+
+
+
+
+
+
+ {{ formatDate(scope.row.startDate) }}
+
+
+ {{ formatDate(scope.row.endDate) }}
+
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
index c3841b1..e93b302 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -43,11 +43,10 @@ export default {
}
},
disabledDate: (time) => {//只能选择5年数据
- let curDate = (new Date()).getTime();
- let three = 5 * 12 * 30 * 24 * 3600 * 1000;
- let min = curDate + three;
- let max = curDate - three;
if (this.choiceDate) {
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let min = this.choiceDate + three;
+ let max = this.choiceDate - three;
return time.getTime() < max || time.getTime() > min;
} else {
return false;
@@ -253,6 +252,12 @@ export default {
this.dialog.visible = true
this.preViewFile = file
},
+ // 过滤时间日期
+ formatDate(dateStr) {
+ const date = new Date(dateStr);
+ console.log(date)
+ return date.toISOString().split('T')[0];
+ }
},
created() {
this.getTreeData();
@@ -416,7 +421,7 @@ export default {
- {{ scope.row.detail.finishedTime }}
+ {{ formatDate(scope.row.detail.finishedTime) }}
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index 60c0fe2..e120eef 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -47,11 +47,10 @@ export default {
}
},
disabledDate: (time) => {//只能选择5年数据
- let curDate = (new Date()).getTime();
- let three = 5 * 12 * 30 * 24 * 3600 * 1000;
- let min = curDate + three;
- let max = curDate - three;
if (this.choiceDate) {
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let min = this.choiceDate + three;
+ let max = this.choiceDate - three;
return time.getTime() < max || time.getTime() > min;
} else {
return false;
@@ -247,6 +246,12 @@ export default {
this.dialog.visible = true
this.preViewFile = file
},
+ // 过滤时间日期
+ formatDate(dateStr) {
+ const date = new Date(dateStr);
+ console.log(date)
+ return date.toISOString().split('T')[0];
+ }
},
created() {
this.getTreeData();
@@ -400,7 +405,7 @@ export default {
label="计划开始/结束时间"
>
- {{ scope.row.detail.startDate }}/{{scope.row.detail.endDate}}
+ {{ formatDate(scope.row.detail.startDate) }}/{{formatDate(scope.row.detail.endDate)}}
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
index ff0a003..493e3f1 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
@@ -52,29 +52,34 @@ export default {
handleSave(reset) {
const formRef = this.$refs.formRef
formRef.submit(async (res) => {
- console.log(res)
- const data = {...res}
- data.plan = undefined
- data.doc = {}
- data.ledgerDoc = {}
- data.doc.docs = formRef.filesList.map((v) => v.url) || [];
- data.ledgerDoc.images = formRef.ledgerList.map((v) => v.url) || [];
- console.log(data);
- try {
- if (this.id) {
- await putYhRecord({id: this.id, ...data});
- } else {
- await postYhRecord(data)
- }
- this.$message.success("提交成功");
- if (!reset) {
- this.$router.go(-1)
- } else {
- formRef.reset()
- }
- } catch (error) {
- console.log(error)
- }
+ this.$confirm("确认提交吗?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(async () => {
+ const data = {...res}
+ data.plan = undefined
+ data.doc = {}
+ data.ledgerDoc = {}
+ data.doc.docs = formRef.filesList.map((v) => v.url) || [];
+ data.ledgerDoc.images = formRef.ledgerList.map((v) => v.url) || [];
+ console.log(data);
+ try {
+ if (this.id) {
+ await putYhRecord({id: this.id, ...data});
+ } else {
+ await postYhRecord(data)
+ }
+ this.$message.success("提交成功");
+ if (!reset) {
+ this.$router.go(-1)
+ } else {
+ formRef.reset()
+ }
+ } catch (error) {
+ console.log(error)
+ }
+ });
})
},
handlePassed() {
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 53dc5eb..6dd7e6c 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -263,6 +263,10 @@
v-for="(activity, index) in activities"
:key="index"
:timestamp="activity.approvalTime">
+ 待提交
+ 审批中
+ 已通过
+ 已驳回
审批意见: {{activity.comment}}
审批附件: {{
activity.docs &&
@@ -587,15 +591,7 @@ export default {
searchPlan(value) {
postDFMaintenancePlanList({
data: {
- timeView: {
- timeField: "create_time",
- },
- dikeCode: this.$route.query.dikeCode,
- },
- cv: {
- name: "name",
- type: "like",
- value,
+ dikeName: value,
},
pageSize: 100,
pageNum: 1,
@@ -709,5 +705,12 @@ export default {
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index 5bbb51d..ee5c506 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -41,11 +41,10 @@ export default {
}
},
disabledDate: (time) => {//只能选择5年数据
- let curDate = (new Date()).getTime();
- let three = 5 * 12 * 30 * 24 * 3600 * 1000;
- let min = curDate + three;
- let max = curDate - three;
if (this.choiceDate) {
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let min = this.choiceDate + three;
+ let max = this.choiceDate - three;
return time.getTime() < max || time.getTime() > min;
} else {
return false;
@@ -262,6 +261,12 @@ export default {
});
return name || type;
},
+ // 过滤时间日期
+ formatDate(dateStr) {
+ const date = new Date(dateStr);
+ console.log(date)
+ return date.toISOString().split('T')[0];
+ }
},
created() {
this.getTreeData()
@@ -426,7 +431,7 @@ export default {
- {{ scope.row.plan ? scope.row.plan.endDate : '' }}
+ {{ scope.row.plan ? formatDate(scope.row.plan.endDate) : '' }}
diff --git a/src/views/mobilePage/index.vue b/src/views/mobilePage/index.vue
index b2b22a0..f6889dc 100644
--- a/src/views/mobilePage/index.vue
+++ b/src/views/mobilePage/index.vue
@@ -5,21 +5,30 @@
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index 48d4953..44c915c 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -40,11 +40,10 @@ export default {
}
},
disabledDate: (time) => {//只能选择5年数据
- let curDate = (new Date()).getTime();
- let three = 5 * 12 * 30 * 24 * 3600 * 1000;
- let min = curDate + three;
- let max = curDate - three;
if (this.choiceDate) {
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let min = this.choiceDate + three;
+ let max = this.choiceDate - three;
return time.getTime() < max || time.getTime() > min;
} else {
return false;
@@ -261,6 +260,12 @@ export default {
});
return name || type;
},
+ // 过滤时间日期
+ formatDate(dateStr) {
+ const date = new Date(dateStr);
+ console.log(date)
+ return date.toISOString().split('T')[0];
+ }
},
created() {
this.getTreeData()
@@ -421,7 +426,7 @@ export default {
- {{ scope.row.plan ? scope.row.plan.endDate : '' }}
+ {{ scope.row.plan ? formatDate(scope.row.plan.endDate) : '' }}