diff --git a/src/store/getters.js b/src/store/getters.js
index 342cd7c..0791c50 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -5,6 +5,7 @@ const getters = {
visitedViews: state => state.tagsView.visitedViews,
cachedViews: state => state.tagsView.cachedViews,
token: state => state.user.token,
+ adcd: state => state.user.adcd,
avatar: state => state.user.avatar,
name: state => state.user.name,
logo: state => state.user.logo,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 347e663..4c765c5 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,6 +5,7 @@ const user = {
state: {
token: getToken(),
name: '',
+ adcd: '',
avatar: '',
roles: [],
permissions: [],
@@ -15,6 +16,9 @@ const user = {
SET_TOKEN: (state, token) => {
state.token = token
},
+ SET_ADCD: (state, adcd) => {
+ state.adcd = adcd
+ },
SET_NAME: (state, name) => {
state.name = name
},
@@ -68,7 +72,9 @@ const user = {
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
+ console.log(user)
commit('SET_NAME', user.userName)
+ commit('SET_ADCD', res.adcd)
commit('SET_AVATAR', avatar)
// commit('SET_LOGO', res.user.dept.adminLogo)
resolve(res)
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index 8aa0d06..ffa5466 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -120,16 +120,15 @@
-
+ >
万元
@@ -217,6 +218,7 @@
size="small"
:rows="5"
type="textarea"
+ maxlength="500"
v-model="formData.comment"
placeholder="请输入,文字限制500字内"
>
@@ -231,6 +233,7 @@
action="#"
:http-request="handleUpload"
:before-upload="beforeUpload"
+ :on-remove="handleRemove"
accept=".docx,.doc,.pdf"
show-file-list
:file-list="filesList"
@@ -365,6 +368,12 @@ export default {
});
},
methods: {
+ handleRemove(file, fileList) {
+ this.filesList = fileList
+ },
+ handleRemoveProject(file, fileList) {
+ this.projectList = fileList
+ },
// 获取详情
getDetail() {
getYhPlanDetails(this.id).then((res) => {
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index 6435579..499da06 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -32,6 +32,14 @@ export default {
name: "",
planDateArr: [],
},
+ pickerOption: {
+ disabledDate(time) {//只能选择5年数据
+ let curDate = (new Date()).getTime();
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let threeMonths = curDate - three;
+ return time.getTime() > Date.now() || time.getTime() < threeMonths;
+ }
+ },
currentRow: {},
dialogVisible: false,
areasOptions: [], // 行政区划列表
@@ -214,7 +222,7 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
@@ -233,6 +241,7 @@ export default {
mounted() {
// 获取列表数据
this.getTableData();
+ console.log(this.$store.getters.adcd)
},
};
@@ -307,6 +316,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -392,7 +402,7 @@ export default {
以通过已通过
Date.now() || time.getTime() < threeMonths;
+ }
+ },
+ dialog: {
+ title: '预览',
+ dom: '',
+ visible: false
+ },
+ preViewFile: '',
currentRow: {},
dialogVisible: false,
patrolType: [], // 巡查周期类型
@@ -199,11 +215,32 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
},
+ getFileName(doc) {
+ if (!doc || !doc.docs) {
+ return ''
+ }
+ return doc.docs.map((v) => {
+ return {
+ name: v.split("/")[v.split("/").length - 1],
+ file: v
+ }
+
+ })
+ },
+ // 关闭dialog
+ closeDialog() {
+ this.dialog.visible = false
+ },
+ handlePreview(file) {
+ console.log(file)
+ this.dialog.visible = true
+ this.preViewFile = file
+ },
},
created() {
this.getTreeData();
@@ -306,6 +343,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -335,8 +373,8 @@ export default {
>
全部
待验收
- 已驳回重整
- 已通过验收
+ 已驳回
+ 已验收
@@ -397,14 +435,14 @@ export default {
- {{
- scope.row &&
- scope.row.doc &&
- scope.row.doc.docs &&
- scope.row.doc.docs
- .map((v) => v.split("/")[v.split("/").length - 1])
- .join("、")
- }}
+
+ {{ item.name }}、
+
@@ -426,12 +464,12 @@ export default {
>
已驳回
已撤回
@@ -510,6 +548,15 @@ export default {
取消
+
+
+
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index ad4482c..5fc5dc4 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -18,10 +18,12 @@ import { getAreasData } from "@/api/areas/index";
import { uploadFileData } from "@/api/system/upload";
import { reqCountMixins } from "@/mixins/reqCount";
import { paginationMixins } from "@/mixins/commonPagination";
+import preview from "@/views/dike/runManage/dispatch/plan/components/preview.vue";
export default {
name: "InspectionItems",
components: {
+ preview,
TopBackTitle,
PlanDetail,
},
@@ -36,6 +38,20 @@ export default {
name: "",
planDateArr: [],
},
+ pickerOption: {
+ disabledDate(time) {//只能选择5年数据
+ let curDate = (new Date()).getTime();
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let threeMonths = curDate - three;
+ return time.getTime() > Date.now() || time.getTime() < threeMonths;
+ }
+ },
+ dialog: {
+ title: '预览',
+ dom: '',
+ visible: false
+ },
+ preViewFile: '',
currentRow: {},
dialogVisible: false,
areasOptions: [], // 行政区划
@@ -194,11 +210,31 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
},
+ getFileName(doc) {
+ if (!doc || !doc.docs) {
+ return ''
+ }
+ return doc.docs.map((v) => {
+ return {
+ name: v.split("/")[v.split("/").length - 1],
+ file: v
+ }
+
+ })
+ },
+ // 关闭dialog
+ closeDialog() {
+ this.dialog.visible = false
+ },
+ handlePreview(file) {
+ this.dialog.visible = true
+ this.preViewFile = file
+ },
},
created() {
this.getTreeData();
@@ -289,6 +325,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -377,14 +414,14 @@ export default {
- {{
- scope.row.detail &&
- scope.row.detail.doc &&
- scope.row.detail.doc.docs &&
- scope.row.detail.doc.docs
- .map((v) => v.split("/")[v.split("/").length - 1])
- .join("、")
- }}
+
+ {{ item.name }}、
+
@@ -395,14 +432,14 @@ export default {
- {{
- scope.row &&
- scope.row.doc &&
- scope.row.doc.docs &&
- scope.row.doc.docs
- .map((v) => v.split("/")[v.split("/").length - 1])
- .join("、")
- }}
+
+ {{ item.name }}、
+
@@ -509,6 +546,15 @@ export default {
取消
+
+
+
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index cb1e397..e0f7f98 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -125,16 +125,15 @@
-
+ >
万元
-
+
点击上传
@@ -197,6 +198,24 @@
文件上传支持.jpg .png .tif .gif 单张图片5M以内 最多上传3张
+
@@ -206,6 +225,7 @@
size="small"
:rows="5"
type="textarea"
+ maxlength="500"
v-model="ruleForm.comment"
placeholder="请输入,文字限制500字内"
>
@@ -220,6 +240,7 @@
action="#"
:http-request="handleUpload1"
:before-upload="beforeUpload1"
+ :on-remove="handleRemove1"
accept=".docx,.doc,.pdf"
show-file-list
:file-list="filesList1"
@@ -295,15 +316,15 @@ export default {
planId: [
{ required: false, message: "请输入维养计划名称", trigger: "blur" },
],
- before: [
- { required: true, message: "请输入维修养护前", trigger: "blur" },
+ remark: [
+ { required: true, message: "请输入维修描述", trigger: "blur" },
],
comment: [{ required: true, message: "请输入审批意见", trigger: "blur" }],
- middle: [
- { required: true, message: "请输入维修养护过程", trigger: "blur" },
+ ledgerDoc: [
+ {required: true, validator: this.validatorProjectList },
],
- after: [
- { required: true, message: "请输入维修养护结束后", trigger: "blur" },
+ ledgerImg: [
+ { required: true, validator: this.validatorProjectListImg },
],
},
supplementRules: {
@@ -343,6 +364,32 @@ export default {
},
},
methods: {
+ handleRemove(file, fileList) {
+ this.filesList = fileList
+ },
+ handleRemove1(file, fileList) {
+ this.filesList1 = fileList
+ },
+ handleRemoveledger(index) {
+ this.ledgerList.splice(index, 1);
+ },
+ // 验证维养台账
+ validatorProjectList(rule, value, callback) {
+ if (this.filesList.length === 0) {
+ callback(new Error("请上传维养台账"));
+ } else {
+ callback();
+ }
+ },
+
+ // 验证维养图片
+ validatorProjectListImg(rule, value, callback) {
+ if (this.ledgerList.length === 0) {
+ callback(new Error("请上传维养图片"));
+ } else {
+ callback();
+ }
+ },
getDetail() {
getYhRecord({id: this.id}).then((res) => {
this.ruleForm = res.data;
@@ -399,8 +446,8 @@ export default {
// 审批文件上传前
beforeUploadLedger(e) {
const { name, size } = e;
- if (size > 50 * 1024 * 1024) {
- this.$message.warning("文件大小不能超过100M");
+ if (size > 5 * 1024 * 1024) {
+ this.$message.warning("文件大小不能超过5M");
return false;
}
if (!/\.(jpg|png|tif|gif)$/.test(name)) {
@@ -549,7 +596,7 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index d0131f2..d1ffbc8 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -32,6 +32,14 @@ export default {
name: "",
planDateArr: [],
},
+ pickerOption: {
+ disabledDate(time) {//只能选择5年数据
+ let curDate = (new Date()).getTime();
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let threeMonths = curDate - three;
+ return time.getTime() > Date.now() || time.getTime() < threeMonths;
+ }
+ },
areasOptions: [],
embankmentTypeOptions: [],
currentRow: {},
@@ -217,7 +225,7 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
@@ -339,6 +347,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -439,7 +448,7 @@ export default {
以通过已通过
-
+ >
万元
@@ -217,6 +218,7 @@
size="small"
:rows="5"
type="textarea"
+ maxlength="500"
v-model="formData.comment"
placeholder="请输入,文字限制500字内"
>
@@ -231,6 +233,7 @@
action="#"
:http-request="handleUpload"
:before-upload="beforeUpload"
+ :on-remove="handleRemove"
accept=".docx,.doc,.pdf"
show-file-list
:file-list="filesList"
@@ -364,6 +367,12 @@ export default {
});
},
methods: {
+ handleRemove(file, fileList) {
+ this.filesList = fileList
+ },
+ handleRemoveProject(file, fileList) {
+ this.projectList = fileList
+ },
// 获取详情
getDetail() {
getRunSzYhPlan({id: this.id}).then((res) => {
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index fc2eb77..0e929c8 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -31,6 +31,14 @@ export default {
name: "",
planDateArr: [],
},
+ pickerOption: {
+ disabledDate(time) {//只能选择5年数据
+ let curDate = (new Date()).getTime();
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let threeMonths = curDate - three;
+ return time.getTime() > Date.now() || time.getTime() < threeMonths;
+ }
+ },
currentRow: {},
dialogVisible: false,
areasOptions: [], // 行政区划列表
@@ -213,7 +221,7 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
@@ -306,6 +314,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -388,7 +397,7 @@ export default {
以通过已通过
Date.now() || time.getTime() < threeMonths;
+ }
+ },
+ dialog: {
+ title: '预览',
+ dom: '',
+ visible: false
+ },
+ preViewFile: '',
currentRow: {},
dialogVisible: false,
personnelList: [], // 人员列表
@@ -196,11 +212,31 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
},
+ getFileName(doc) {
+ if (!doc || !doc.docs) {
+ return ''
+ }
+ return doc.docs.map((v) => {
+ return {
+ name: v.split("/")[v.split("/").length - 1],
+ file: v
+ }
+
+ })
+ },
+ // 关闭dialog
+ closeDialog() {
+ this.dialog.visible = false
+ },
+ handlePreview(file) {
+ this.dialog.visible = true
+ this.preViewFile = file
+ },
},
created() {
this.getTreeData();
@@ -300,6 +336,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -329,8 +366,8 @@ export default {
>
全部
待验收
- 已驳回重整
- 已通过验收
+ 已驳回
+ 已验收
@@ -391,14 +428,14 @@ export default {
- {{
- scope.row &&
- scope.row.doc &&
- scope.row.doc.docs &&
- scope.row.doc.docs
- .map((v) => v.split("/")[v.split("/").length - 1])
- .join("、")
- }}
+
+ {{ item.name }}、
+
@@ -420,12 +457,12 @@ export default {
>
已驳回
已撤回
@@ -504,6 +541,15 @@ export default {
取消
+
+
+
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index 569d21b..443a33d 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -9,10 +9,12 @@ import { getAreasData } from "@/api/areas/index";
import { reqCountMixins } from "@/mixins/reqCount";
import { paginationMixins } from "@/mixins/commonPagination";
+import preview from "@/views/dike/runManage/dispatch/plan/components/preview.vue";
export default {
name: "InspectionItems",
components: {
+ preview,
TopBackTitle,
PlanDetail,
},
@@ -27,6 +29,20 @@ export default {
name: "",
planDateArr: [],
},
+ pickerOption: {
+ disabledDate(time) {//只能选择5年数据
+ let curDate = (new Date()).getTime();
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let threeMonths = curDate - three;
+ return time.getTime() > Date.now() || time.getTime() < threeMonths;
+ }
+ },
+ dialog: {
+ title: '预览',
+ dom: '',
+ visible: false
+ },
+ preViewFile: '',
currentRow: {},
dialogVisible: false,
areasOptions: [], // 行政区划
@@ -185,11 +201,31 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
},
+ getFileName(doc) {
+ if (!doc || !doc.docs) {
+ return ''
+ }
+ return doc.docs.map((v) => {
+ return {
+ name: v.split("/")[v.split("/").length - 1],
+ file: v
+ }
+
+ })
+ },
+ // 关闭dialog
+ closeDialog() {
+ this.dialog.visible = false
+ },
+ handlePreview(file) {
+ this.dialog.visible = true
+ this.preViewFile = file
+ },
},
created() {
this.getTreeData();
@@ -280,6 +316,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -368,14 +405,14 @@ export default {
- {{
- scope.row.detail &&
- scope.row.detail.doc &&
- scope.row.detail.doc.docs &&
- scope.row.detail.doc.docs
- .map((v) => v.split("/")[v.split("/").length - 1])
- .join("、")
- }}
+
+ {{ item.name }}、
+
@@ -386,14 +423,14 @@ export default {
- {{
- scope.row &&
- scope.row.doc &&
- scope.row.doc.docs &&
- scope.row.doc.docs
- .map((v) => v.split("/")[v.split("/").length - 1])
- .join("、")
- }}
+
+ {{ item.name }}、
+
@@ -500,6 +537,15 @@ export default {
取消
+
+
+
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 1b7f476..9dece66 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -125,16 +125,15 @@
-
+ >
万元
-
+
点击上传
@@ -197,6 +199,24 @@
文件上传支持.jpg .png .tif .gif 单张图片5M以内 最多上传3张
+
@@ -206,6 +226,7 @@
size="small"
:rows="5"
type="textarea"
+ maxlength="500"
v-model="ruleForm.comment"
placeholder="请输入,文字限制500字内"
>
@@ -220,6 +241,7 @@
action="#"
:http-request="handleUpload1"
:before-upload="beforeUpload1"
+ :on-remove="handleRemove1"
accept=".docx,.doc,.pdf"
show-file-list
:file-list="filesList1"
@@ -292,15 +314,15 @@ export default {
planId: [
{ required: false, message: "请输入维养计划名称", trigger: "blur" },
],
- before: [
- { required: true, message: "请输入维修养护前", trigger: "blur" },
+ remark: [
+ { required: true, message: "请输入维修描述", trigger: "blur" },
],
comment: [{ required: true, message: "请输入审批意见", trigger: "blur" }],
- middle: [
- { required: true, message: "请输入维修养护过程", trigger: "blur" },
+ ledgerDoc: [
+ {required: true, validator: this.validatorProjectList },
],
- after: [
- { required: true, message: "请输入维修养护结束后", trigger: "blur" },
+ ledgerImg: [
+ { required: true, validator: this.validatorProjectListImg },
],
},
supplementRules: {
@@ -340,6 +362,32 @@ export default {
},
},
methods: {
+ handleRemove(file, fileList) {
+ this.filesList = fileList
+ },
+ handleRemove1(file, fileList) {
+ this.filesList1 = fileList
+ },
+ handleRemoveledger(index) {
+ this.ledgerList.splice(index, 1);
+ },
+ // 验证维养台账
+ validatorProjectList(rule, value, callback) {
+ if (this.filesList.length === 0) {
+ callback(new Error("请上传计划方案"));
+ } else {
+ callback();
+ }
+ },
+
+ // 验证维养图片
+ validatorProjectListImg(rule, value, callback) {
+ if (this.ledgerList.length === 0) {
+ callback(new Error("请上传计划方案"));
+ } else {
+ callback();
+ }
+ },
getDetail() {
getRunSzYhRecord({id: this.id}).then((res) => {
this.ruleForm = res.data;
@@ -396,8 +444,8 @@ export default {
// 审批文件上传前
beforeUploadLedger(e) {
const { name, size } = e;
- if (size > 50 * 1024 * 1024) {
- this.$message.warning("文件大小不能超过100M");
+ if (size > 5 * 1024 * 1024) {
+ this.$message.warning("文件大小不能超过5M");
return false;
}
if (!/\.(jpg|png|tif|gif)$/.test(name)) {
@@ -547,7 +595,7 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index 9dea7a5..a12129d 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -31,6 +31,14 @@ export default {
name: "",
planDateArr: [],
},
+ pickerOption: {
+ disabledDate(time) {//只能选择5年数据
+ let curDate = (new Date()).getTime();
+ let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+ let threeMonths = curDate - three;
+ return time.getTime() > Date.now() || time.getTime() < threeMonths;
+ }
+ },
areasOptions: [],
embankmentTypeOptions: [],
currentRow: {},
@@ -216,7 +224,7 @@ export default {
const dict = this.supplementOptions?.find((element) => {
return element.dictValue == supplement.type
})
- let subName = `${dict.dictLabel}/${supplement.amount}`
+ let subName = `${dict.dictLabel}/${supplement.amount.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`
name = name + ' ' + subName
})
return name;
@@ -338,6 +346,7 @@ export default {
size="small"
class="ml-10"
v-model="paramsData.planDateArr"
+ :picker-options="pickerOption"
type="daterange"
placeholder="开始日期"
value-format="yyyy-MM-dd"
@@ -436,7 +445,7 @@ export default {
以通过已通过